Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 24 Aug 2011 21:07:32 +0000 (14:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 24 Aug 2011 21:07:32 +0000 (14:07 -0700)

Trivial merge